Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <[email protected]>
Tue, 9 Sep 2008 21:59:11 +0000 (23:59 +0200)
committerWolfgang Denk <[email protected]>
Tue, 9 Sep 2008 21:59:11 +0000 (23:59 +0200)

Trivial merge